Skip to content

desktop: Prefer non-sRGB surface formats#20965

Merged
Dinnerbone merged 1 commit intoruffle-rs:masterfrom
torokati44:prefer-non-srgb
Oct 11, 2025
Merged

desktop: Prefer non-sRGB surface formats#20965
Dinnerbone merged 1 commit intoruffle-rs:masterfrom
torokati44:prefer-non-srgb

Conversation

@torokati44
Copy link
Member

@torokati44 torokati44 commented Jul 11, 2025

This is a half measure to unblock #20898 (following emilk/egui#7311) - the colors are probably still not right if only sRGB formats are supported.

@torokati44 torokati44 added A-desktop Area: Desktop Application T-refactor Type: Refactor / Cleanup labels Jul 11, 2025
@torokati44
Copy link
Member Author

If you have any ideas/capacity, @Dinnerbone, I'd appreciate you helping out (or even taking over, as you please).

@torokati44 torokati44 marked this pull request as ready for review September 22, 2025 09:59
@torokati44
Copy link
Member Author

I am now on the opinion that this hasn't even worked correctly before with both sRGB and linear surface formats - the difference is just less noticeable when the mismatch is one way than when in the other (when it's darkening vs. when it's lightening).

@torokati44
Copy link
Member Author

torokati44 commented Sep 22, 2025

See, wrt. #21730:

egui version / surface format sRGB linear
current current_egui_srgb current_egui_linear
updated new_egui_srgb new_egui_linear

(Please excuse the window shadow in one of the screenshots...)
(The text may look different because of emilk/egui#7431?)

@torokati44
Copy link
Member Author

So maybe this should be included in #21730 instead of being separate...?

@torokati44
Copy link
Member Author

torokati44 commented Sep 23, 2025

actually, since this has nothing to do with wgpu 26, we could switch to the egui 0.32.3 release first, and have this fix included for it, (and then later, if we want wgpu 26, switch back to a later egui master, but that's an independent story).

@torokati44 torokati44 force-pushed the prefer-non-srgb branch 2 times, most recently from 313a781 to 5d8a8e3 Compare September 23, 2025 14:59
@torokati44
Copy link
Member Author

torokati44 commented Sep 23, 2025

Okay, added an egui bump to just after emilk/egui#7311 (but before their wgpu 26 update or the text kerning change) in here, so there shouldn't be a gamma-mismatched, regressed, intermediate state.

@Dinnerbone Dinnerbone enabled auto-merge (rebase) October 11, 2025 23:19
@Dinnerbone Dinnerbone merged commit 3918598 into ruffle-rs:master Oct 11, 2025
25 checks passed
Hancock33 added a commit to Hancock33/batocera.piboy that referenced this pull request Oct 12, 2025
------------------------------------------------------------------------------------------
duckstation.mk c117059c82f14fe119d0b23c1229156e3bbeba07 # Version: Commits on Oct 12, 2025
------------------------------------------------------------------------------------------
GPU/HW: Fix crash when preloading texture replacements,

-------------------------------------------------------------------------------------
hatari.mk 29b13aa04394391be010ca18d2e0ce70109c9685 # Version: Commits on Oct 12, 2025
-------------------------------------------------------------------------------------
Make control.c independent from the SDL

Move the window embedding functions into screen.c to make control.c

independent from the SDL headers.,

----------------------------------------------------
pcsx2.mk v2.5.219 # Version: Commits on Oct 12, 2025
----------------------------------------------------
- [Deps: Update Windows and Linux to Qt 6.10.0](PCSX2/pcsx2#13360)

-----------------------------------------------------
ryujinx.mk 1.3.156 # Version: Commits on Oct 12, 2025
-----------------------------------------------------
Canary-1.3.156

-------------------------------------------------------------------------------------
snes9x.mk cdffce2e32bfc0305fd5489831d09b5e730bed9b # Version: Commits on Oct 12, 2025
-------------------------------------------------------------------------------------
qt: Update compatibility for Qt 6.10.,

-------------------------------------------------
vice.mk r45792 # Version: Commits on Oct 11, 2025
-------------------------------------------------
set tap_buffer=NULL after free(), fixes #2173

git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45792 379a1393-f5fb-40a0-bcee-ef074d9b53f7,

-------------------------------------------------------------------------------------------
xenia-native.mk 62439cc24e6ffb738ba001b2bc2c3e7ea0ddc77f # Version: Commits on Oct 11, 2025
-------------------------------------------------------------------------------------------
[UI] Restored notification sending on window open/close,

-----------------------------------------------------------------------------------
ymir.mk 20bf77d6eeff6da311e8a43d5fc91655148b8ad7 # Version: Commits on Oct 12, 2025
-----------------------------------------------------------------------------------
feat(updater): Cleanup unused code, structure update logic skeleton,

---------------------------------------------------------------
ruffle.mk nightly-2025-10-12 # Version: Commits on Oct 12, 2025
---------------------------------------------------------------
## What's Changed

* exporter: Add more tests by @kjarosh in ruffle-rs/ruffle#21892

* debug_ui: Improve mask/maskee fields by @kjarosh in ruffle-rs/ruffle#21842

* exporter: Various refactors by @kjarosh in ruffle-rs/ruffle#21891

* `from_shumway/localconnection` test doesn't need image comparison by @Dinnerbone in ruffle-rs/ruffle#21898

* desktop: Prefer non-sRGB surface formats by @torokati44 in ruffle-rs/ruffle#20965

* avm1: Maintain two separate `_global`s for SWF 6- and 7+ by @moulins in ruffle-rs/ruffle#21863

**Full Changelog**: ruffle-rs/ruffle@nightly-2025-10-11...nightly-2025-10-12,

-------------------------------------------------
ecm.mk v6.19.0 # Version: Commits on Mar 23, 2024
-------------------------------------------------
Improvements and fixes for KDEInstallDirs documentation,

------------------------------------------------------------------------------------
box64.mk af437fa354f387fb563ded1a8db7c5051148b5cd # Version: Commits on Oct 12, 2025
------------------------------------------------------------------------------------
[ARM64_DYNAREC] Fixed a typo in iret_to_epilog (#3059),

----------------------------------------------------------------------------------------
openmohaa.mk fb741a9a0b30ae9af9a0e553d69ba4fb4a5eae3c # Version: Commits on Oct 11, 2025
----------------------------------------------------------------------------------------
Add Sys_OpenFolderInFileManager,

--------------------------------------------------------------------------------------
stalker.mk a71de4f8a647e8e55572eac39efc9e3e90dfddbc # Version: Commits on Oct 12, 2025
--------------------------------------------------------------------------------------
xrEngine/FDemoRecord.cpp: ability to open editor from the demo record,

----------------------------------------------------------------------------------------
doomretro.mk 6c99b05fdaac67c6078f33a5d2527fc6d479df70 # Version: Commits on Oct 12, 2025
----------------------------------------------------------------------------------------
Minor tweaks,

-----------------------------------------------------------------------------------
tr1x.mk 69536afb65cb0f1bc3746f9593c9de30614f07b6 # Version: Commits on Oct 11, 2025
-----------------------------------------------------------------------------------
tr1/types: remove PHD_ANGLE,

-----------------------------------------------------------------------------------
tr2x.mk 69536afb65cb0f1bc3746f9593c9de30614f07b6 # Version: Commits on Oct 11, 2025
-----------------------------------------------------------------------------------
tr1/types: remove PHD_ANGLE,

------------------------------------------------------------------------------------------
xash3d-fwgs.mk 4f444ee6eaa91369788114f415ea56cb3221f498 # Version: Commits on Oct 11, 2025
------------------------------------------------------------------------------------------
engine: client: for goldsrc status messages, always mark them of goldsrc protocol,

--------------------------------------------------------------------------------------------------
libretro-gearcoleco.mk d76579dba9daad6e0898997c2bec47cdba9aecf9 # Version: Commits on Oct 11, 2025
--------------------------------------------------------------------------------------------------
Fix default custom palette. #82,

------------------------------------------------------------------------------------------------
libretro-panda3ds.mk bac050fc4b08d0da13d371d9cfbe798287331794 # Version: Commits on Oct 12, 2025
------------------------------------------------------------------------------------------------
Fastmem: Fix iOS/OSX checks (#813),

---------------------------------------------------------------------------------------------
libretro-vba-m.mk 49773388e1568cdc698a5b41d95624d9697774c0 # Version: Commits on Oct 11, 2025
---------------------------------------------------------------------------------------------
Fix 3d6cad6d for revert of 56ea6456

Fixed with Claude.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>,
@Lord-McSweeney Lord-McSweeney removed the waiting-on-review Waiting on review from a Ruffle team member label Oct 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-desktop Area: Desktop Application T-refactor Type: Refactor / Cleanup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants